From 8fdc517b910a5453c0d57fee0537341da1513d32 Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Fri, 1 Jun 2018 09:34:30 -0600 Subject: [PATCH] clang-tidy replaces C standard library headers with their C++ alternatives. -header-filter=.*\\.h -checks=-*,modernize-deprecated-headers -fix --- cet.h | 2 +- compegps.cc | 6 +++--- defs.h | 2 +- garmin_device_xml.h | 2 +- garmin_txt.cc | 2 +- gbser.h | 2 +- gbsleep.cc | 2 +- height.h | 2 +- jeeps/garminusb.h | 2 +- jeeps/gps.h | 2 +- jeeps/gpscom.h | 2 +- jeeps/gpsfmt.h | 4 ++-- navilink.h | 2 +- src/core/datetime.h | 2 +- src/core/file.h | 2 +- src/core/logging.h | 2 +- stmsdf.cc | 6 +++--- stmwpp.cc | 6 +++--- transform.cc | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cet.h b/cet.h index cd4fe108f..d1333211c 100644 --- a/cet.h +++ b/cet.h @@ -22,7 +22,7 @@ #ifndef CET_H #define CET_H -#include // for size_t +#include // for size_t #define CET_ERROR 1 #define CET_SUCCESS 0 diff --git a/compegps.cc b/compegps.cc index ff7104dc0..e8919a6ef 100644 --- a/compegps.cc +++ b/compegps.cc @@ -61,10 +61,10 @@ #include "csv_util.h" #if CSVFMTS_ENABLED -#include +#include #include "jeeps/gpsmath.h" -#include -#include +#include +#include #define MYNAME "CompeGPS" diff --git a/defs.h b/defs.h index 98e025f16..dc9b77efc 100644 --- a/defs.h +++ b/defs.h @@ -19,7 +19,7 @@ #ifndef DEFS_H_INCLUDED_ #define DEFS_H_INCLUDED_ -#include +#include #if HAVE_CONFIG_H #include "config.h" diff --git a/garmin_device_xml.h b/garmin_device_xml.h index 067d44a76..924bb3e0f 100644 --- a/garmin_device_xml.h +++ b/garmin_device_xml.h @@ -51,6 +51,6 @@ const gdx_info* gdx_find_file(char** dirlist); // that can't back out tracefully without bludgeoning most of the // (Mac|Lin|Win) x (USB|Serial) matrix. Since we don't *really* want // to progress any further, we just longjump back to the caller... -#include +#include extern jmp_buf gdx_jmp_buf; diff --git a/garmin_txt.cc b/garmin_txt.cc index 6abe3b566..38270128f 100644 --- a/garmin_txt.cc +++ b/garmin_txt.cc @@ -33,7 +33,7 @@ #include "strptime.h" #include -#include // qsort +#include // qsort #define MYNAME "garmin_txt" diff --git a/gbser.h b/gbser.h index 661d2c505..697c2ca3e 100644 --- a/gbser.h +++ b/gbser.h @@ -22,7 +22,7 @@ #ifndef __GBSER_H #define __GBSER_H -#include // for size_t +#include // for size_t #define gbser_OK 0 #define gbser_NOTHING -1 diff --git a/gbsleep.cc b/gbsleep.cc index cc72a142d..25da77f2d 100644 --- a/gbsleep.cc +++ b/gbsleep.cc @@ -33,7 +33,7 @@ gb_sleep(unsigned long microseconds) #elif defined HAVE_NANOSLEEP -#include +#include void gb_sleep(unsigned long microseconds) { diff --git a/height.h b/height.h index fd8f397dc..56fe5b4b1 100644 --- a/height.h +++ b/height.h @@ -21,7 +21,7 @@ /* Created by "tools/createGeoidGrid 1.0 int8_t" using GeographicLib utility GeoidEval with egm96-5. */ -#include +#include #define GEOID_GRID_DEG 1.0 #define GEOID_SCALE 1.0 diff --git a/jeeps/garminusb.h b/jeeps/garminusb.h index 476e70feb..a090d0af7 100644 --- a/jeeps/garminusb.h +++ b/jeeps/garminusb.h @@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA */ -#include +#include #include "gpsdevice.h" /* This structure is a bit funny looking to avoid variable length diff --git a/jeeps/gps.h b/jeeps/gps.h index 7ef2d3e5e..b897f89d7 100644 --- a/jeeps/gps.h +++ b/jeeps/gps.h @@ -3,7 +3,7 @@ #include "../defs.h" #include "gpsport.h" -#include +#include #define FRAMING_ERROR -1 #define PROTOCOL_ERROR -2 diff --git a/jeeps/gpscom.h b/jeeps/gpscom.h index 1c8c5f3cb..7bbd6a66d 100644 --- a/jeeps/gpscom.h +++ b/jeeps/gpscom.h @@ -3,7 +3,7 @@ #include "gps.h" -#include +#include int32 GPS_Command_Off(const char* port); diff --git a/jeeps/gpsfmt.h b/jeeps/gpsfmt.h index 3f1ce4c9f..454cc77fd 100644 --- a/jeeps/gpsfmt.h +++ b/jeeps/gpsfmt.h @@ -3,8 +3,8 @@ #include "gps.h" -#include -#include +#include +#include void GPS_Fmt_Print_Time(time_t Time, FILE* outf); void GPS_Fmt_Print_Position(double lat, double lon, FILE* outf); diff --git a/navilink.h b/navilink.h index 9f0cc5124..99a89e86e 100644 --- a/navilink.h +++ b/navilink.h @@ -23,7 +23,7 @@ #ifndef NAVILINK_H_INCLUDED_ #define NAVILINK_H_INCLUDED_ -#include +#include #include "defs.h" #define SBP_RECORD_LEN 32 diff --git a/src/core/datetime.h b/src/core/datetime.h index 18a3eaae9..15065f1d1 100644 --- a/src/core/datetime.h +++ b/src/core/datetime.h @@ -21,7 +21,7 @@ */ -#include +#include #include #include diff --git a/src/core/file.h b/src/core/file.h index 1e1fd3880..198cc33c8 100644 --- a/src/core/file.h +++ b/src/core/file.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include "defs.h" // Mimic gbfile open services diff --git a/src/core/logging.h b/src/core/logging.h index f5d257db3..af0a7ed0c 100644 --- a/src/core/logging.h +++ b/src/core/logging.h @@ -24,7 +24,7 @@ #include #include -#include //exit() +#include //exit() class Warning { public: diff --git a/stmsdf.cc b/stmsdf.cc index eca3ca2a8..7dd66f326 100644 --- a/stmsdf.cc +++ b/stmsdf.cc @@ -36,9 +36,9 @@ #include "jeeps/gpsmath.h" #include "grtcirc.h" -#include -#include -#include +#include +#include +#include #define MYNAME "stmsdf" diff --git a/stmwpp.cc b/stmwpp.cc index 55a588024..52be78c2a 100644 --- a/stmwpp.cc +++ b/stmwpp.cc @@ -27,9 +27,9 @@ #include "csv_util.h" #include "cet_util.h" -#include -#include -#include +#include +#include +#include static gbfile* fin, *fout; static route_head* track, *route; diff --git a/transform.cc b/transform.cc index 21c0a0d87..08ce43a29 100644 --- a/transform.cc +++ b/transform.cc @@ -26,7 +26,7 @@ #if FILTERS_ENABLED -#include +#include #define MYNAME "transform" -- 2.30.2